Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nrf_compress: Fix ARM thumb filter cross-chunk issue #18075

Closed
wants to merge 3 commits into from
Closed

nrf_compress: Fix ARM thumb filter cross-chunk issue #18075

wants to merge 3 commits into from

Conversation

nordicjm
Copy link
Contributor 

Fixes an issue with the ARM thumb filter when an instruction
crosses two chunks of data by storing bytes from the first for
use in the second, this results in the output of the first run
being less than the input data size and more than the input data
size for the second run

@nordicjm nordicjm requested a review from a team as a code owner October 22, 2024 07:35
@github-actions github-actions bot added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Oct 22, 2024
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Oct 22, 2024 •
edited
Loading

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
mcuboot nrfconnect/sdk-mcuboot@720fa02 nrfconnect/sdk-mcuboot#353 nrfconnect/sdk-mcuboot#353/files

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Oct 22, 2024 •
edited
Loading

CI Information

To view the history of this post, clich the 'edited' button above
Build number: 3

Inputs:

Sources:

sdk-nrf: PR head: bb5b06c0512dee08bcffb97e1ed180d1084be0c8
mcuboot: PR head: 2854cac95b291b5eca9580640fa77d40450a9b05

more details

sdk-nrf:

PR head: bb5b06c0512dee08bcffb97e1ed180d1084be0c8
merge base: 14a38ddd667f5c60188739c96a1e9dd305495dee
target head (main): 14a38ddd667f5c60188739c96a1e9dd305495dee
Diff

mcuboot:

PR head: 2854cac95b291b5eca9580640fa77d40450a9b05
merge base: 720fa02787366f9f787b847194f6814921147770
target head (main): 68b96b802cdeef77ce4200e776afa46f6d3cfb66
Diff

Github labels

Enabled Name Description
ci-disabled Disable the ci execution
ci-all-test Run all of ci, no test spec filtering will be done
ci-force-downstream Force execution of downstream even if twister fails
ci-run-twister Force run twister
ci-run-zephyr-twister Force run zephyr twister
List of changed files detected by CI (9) 
bootloader
│  ├── mcuboot
│  │  ├── boot
│  │  │  ├── bootutil
│  │  │  │  ├── src
│  │  │  │  │  │ image_validate.c
│  │  │  ├── zephyr
│  │  │  │  ├── decompression.c
│  │  │  │  ├── main.c
│  │  │  │  │ prj.conf
subsys
│  ├── nrf_compress
│  │  ├── lzma
│  │  │  ├── armthumb.c
│  │  │  │ armthumb.h
│  │  ├── src
│  │  │  │ arm_thumb.c
tests
│  ├── subsys
│  │  ├── nrf_compress
│  │  │  ├── decompression
│  │  │  │  ├── arm_thumb
│  │  │  │  │  ├── src
│  │  │  │  │  │  │ main.c
west.yml

Outputs:

Toolchain

Version: 3dd8985b56
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:3dd8985b56_912848a074

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ❌ Build twister
    • sdk-nrf test count: 451
  • ❌ Integration tests
    • ❌ test-fw-nrfconnect-boot
    • ❌ test-sdk-mcuboot
Disabled integration tests
    • desktop52_verification
    • doc-internal
    • test_ble_nrf_config
    • test-fw-nrfconnect-apps
    • test-fw-nrfconnect-ble_mesh
    • test-fw-nrfconnect-ble_samples
    • test-fw-nrfconnect-chip
    • test-fw-nrfconnect-fem
    • test-fw-nrfconnect-nfc
    • test-fw-nrfconnect-nrf-iot_cloud
    • test-fw-nrfconnect-nrf-iot_libmodem-nrf
    • test-fw-nrfconnect-nrf-iot_lwm2m
    • test-fw-nrfconnect-nrf-iot_mosh
    • test-fw-nrfconnect-nrf-iot_nrf_provisioning
    • test-fw-nrfconnect-nrf-iot_positioning
    • test-fw-nrfconnect-nrf-iot_samples
    • test-fw-nrfconnect-nrf-iot_serial_lte_modem
    • test-fw-nrfconnect-nrf-iot_thingy91
    • test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
    • test-fw-nrfconnect-nrf_crypto
    • test-fw-nrfconnect-proprietary_esb
    • test-fw-nrfconnect-ps
    • test-fw-nrfconnect-rpc
    • test-fw-nrfconnect-rs
    • test-fw-nrfconnect-tfm
    • test-fw-nrfconnect-thread
    • test-fw-nrfconnect-zigbee
    • test-low-level
    • test-sdk-audio
    • test-sdk-dfu
    • test-sdk-find-my
    • test-sdk-pmic-samples
    • test-sdk-sidewalk
    • test-sdk-wifi
    • test-secdom-samples-public

Note: This message is automatically posted and updated by the CI

@NordicBuilder
Copy link
Contributor

You can find the documentation preview for this PR at this link. It will be updated about 10 minutes after the documentation build succeeds.

Note: This comment is automatically posted by the Documentation Publishing GitHub Action.

@nordicjm nordicjm added this to the 2.8.0 milestone Oct 22, 2024
nvlsianpu
nvlsianpu requested changes Oct 23, 2024
View reviewed changes
Copy link
Contributor

@nvlsianpu nvlsianpu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One test is failing: nrf/tests/subsys/nrf_compress/decompression/arm_thumb/src/main.c

@nordicjm
nrf_compress: Fix ARM thumb filter cross-chunk issue
407c465 
Fixes an issue with the ARM thumb filter when an instruction
crosses two chunks of data by storing bytes from the first for
use in the second, this results in the output of the first run
being less than the input data size and more than the input data
size for the second run

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
manifest: Update sdk-mcuboot
a2dad5d 
Update MCUboot to include fixes for ARM thumb filter usage

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
tests: nrf_compress: decompression: arm_thumb: Fix for chunks
bb5b06c 
Updates the test to support the new cross-chunk ARM thumb filter
functionality, and verfies that the output size is the expected
size

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
Copy link
Contributor Author

One test is failing: nrf/tests/subsys/nrf_compress/decompression/arm_thumb/src/main.c

Fixed

@nordicjm nordicjm requested a review from nvlsianpu October 23, 2024 07:46
@nordicjm nordicjm mentioned this pull request Oct 24, 2024
Merged
@nordicjm
Copy link
Contributor Author

Including as part of #17567

@nordicjm nordicjm closed this Oct 24, 2024
@nordicjm nordicjm deleted the fixlzmaarmthumbpr branch November 6, 2024 07:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@de-nordic de-nordic de-nordic approved these changes

@gchwier gchwier Awaiting requested review from gchwier

@nvlsianpu nvlsianpu Awaiting requested review from nvlsianpu

Assignees
No one assigned
Labels
changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. DNM manifest manifest-mcuboot
Projects
None yet
Milestone
2.8.0
Development

Successfully merging this pull request may close these issues.
4 participants
@nordicjm @NordicBuilder @nvlsianpu @de-nordic